From 1717bbcb6c1030ab4e05d018c70fd31af7876ca2 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sat, 13 Dec 2014 21:39:15 +0000 Subject: [PATCH] Move cet/cet_util out of defs.h and into files where it's actually used. (Not all of which I'm convinced it's actually _needed_...) --- gpsbabel/compegps.cc | 1 + gpsbabel/cst.cc | 1 + gpsbabel/csv_util.cc | 1 + gpsbabel/defs.h | 2 -- gpsbabel/f90g_track.cc | 1 + gpsbabel/g7towin.cc | 1 + gpsbabel/garmin.cc | 1 + gpsbabel/garmin_fs.cc | 1 + gpsbabel/garmin_txt.cc | 1 + gpsbabel/gbfile.cc | 6 +++--- gpsbabel/gbfile.h | 4 ++-- gpsbabel/gdb.cc | 2 +- gpsbabel/ggv_ovl.cc | 1 + gpsbabel/gopal.cc | 1 + gpsbabel/gpsutil.cc | 1 + gpsbabel/igc.cc | 1 + gpsbabel/netstumbler.cc | 1 + gpsbabel/nmea.cc | 1 + gpsbabel/nmn4.cc | 1 + gpsbabel/ozi.cc | 1 + gpsbabel/pcx.cc | 1 + gpsbabel/raymarine.cc | 3 ++- gpsbabel/stmsdf.cc | 1 + gpsbabel/stmwpp.cc | 1 + gpsbabel/tiger.cc | 1 + gpsbabel/tmpro.cc | 1 + gpsbabel/unicsv.cc | 1 + gpsbabel/xcsv.cc | 1 + gpsbabel/xmltag.cc | 1 + 29 files changed, 32 insertions(+), 9 deletions(-) diff --git a/gpsbabel/compegps.cc b/gpsbabel/compegps.cc index 8badb4e97..d367aa0fc 100644 --- a/gpsbabel/compegps.cc +++ b/gpsbabel/compegps.cc @@ -57,6 +57,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #if CSVFMTS_ENABLED diff --git a/gpsbabel/cst.cc b/gpsbabel/cst.cc index dbcddde4e..e307db2a7 100644 --- a/gpsbabel/cst.cc +++ b/gpsbabel/cst.cc @@ -21,6 +21,7 @@ #include "defs.h" +#include "cet_util.h" #include "strptime.h" #include #include diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc index 2aa5ed4b7..3aeb2fc90 100644 --- a/gpsbabel/csv_util.cc +++ b/gpsbabel/csv_util.cc @@ -23,6 +23,7 @@ #include #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include "garmin_fs.h" #include "grtcirc.h" diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 52df64c1a..16ced996b 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -31,8 +31,6 @@ #include "zlib/zlib.h" #endif #include "gbfile.h" -#include "cet.h" -#include "cet_util.h" #include "inifile.h" #include "session.h" diff --git a/gpsbabel/f90g_track.cc b/gpsbabel/f90g_track.cc index d7a314788..08f7b00e5 100644 --- a/gpsbabel/f90g_track.cc +++ b/gpsbabel/f90g_track.cc @@ -27,6 +27,7 @@ */ #include "defs.h" +#include "gbfile.h" #include #define MYNAME "f90g_track" diff --git a/gpsbabel/g7towin.cc b/gpsbabel/g7towin.cc index 24d1ea8f8..db6de36dd 100644 --- a/gpsbabel/g7towin.cc +++ b/gpsbabel/g7towin.cc @@ -26,6 +26,7 @@ #include "defs.h" #include "csv_util.h" +#include "cet_util.h" #include "garmin_fs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc index b18195c93..5e9102851 100644 --- a/gpsbabel/garmin.cc +++ b/gpsbabel/garmin.cc @@ -25,6 +25,7 @@ #include #include "defs.h" +#include "cet_util.h" #include "grtcirc.h" #include "jeeps/gps.h" #include "jeeps/gpsserial.h" diff --git a/gpsbabel/garmin_fs.cc b/gpsbabel/garmin_fs.cc index de3b01bb3..dc5df1be3 100644 --- a/gpsbabel/garmin_fs.cc +++ b/gpsbabel/garmin_fs.cc @@ -21,6 +21,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "garmin_fs.h" #include "garmin_tables.h" #include "inifile.h" diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc index eb79573ea..182c88a61 100644 --- a/gpsbabel/garmin_txt.cc +++ b/gpsbabel/garmin_txt.cc @@ -23,6 +23,7 @@ #include "defs.h" #if CSVFMTS_ENABLED +#include "cet_util.h" #include "csv_util.h" #include "garmin_fs.h" #include "garmin_tables.h" diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc index a750a2f01..fcb05e3c5 100644 --- a/gpsbabel/gbfile.cc +++ b/gpsbabel/gbfile.cc @@ -492,7 +492,7 @@ memapi_error(gbfile* self) */ gbfile* -gbfopen(const char* filename, const char* mode, const char* module) +gbfopen(const QString filename, const char* mode, const char* module) { gbfile* file; const char* m; @@ -537,7 +537,7 @@ gbfopen(const char* filename, const char* mode, const char* module) file->filewrite = memapi_write; } else { file->name = xstrdup(filename); - file->is_pipe = (strcmp(filename, "-") == 0); + file->is_pipe = (filename == "-"); /* Do we have a '.gz' extension in the filename ? */ len = strlen(file->name); @@ -600,7 +600,7 @@ gbfopen(const char* filename, const char* mode, const char* module) */ gbfile* -gbfopen_be(const char* filename, const char* mode, const char* module) +gbfopen_be(const QString filename, const char* mode, const char* module) { gbfile* result; diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h index e92c75db4..0a69a0bc5 100644 --- a/gpsbabel/gbfile.h +++ b/gpsbabel/gbfile.h @@ -86,8 +86,8 @@ typedef struct gbfile_s { } gbfile_t; -gbfile* gbfopen(const char* filename, const char* mode, const char* module); -gbfile* gbfopen_be(const char* filename, const char* mode, const char* module); +gbfile* gbfopen(const QString filename, const char* mode, const char* module); +gbfile* gbfopen_be(const QString filename, const char* mode, const char* module); #define gbfopen_le gbfopen void gbfclose(gbfile* file); diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index 35bd0780b..ce463eb84 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -23,7 +23,7 @@ #include "defs.h" -#include "cet.h" +#include "cet_util.h" #include "csv_util.h" #include "garmin_fs.h" #include "garmin_tables.h" diff --git a/gpsbabel/ggv_ovl.cc b/gpsbabel/ggv_ovl.cc index 7e08fb922..da45bcdc3 100644 --- a/gpsbabel/ggv_ovl.cc +++ b/gpsbabel/ggv_ovl.cc @@ -21,6 +21,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "inifile.h" #include "grtcirc.h" diff --git a/gpsbabel/gopal.cc b/gpsbabel/gopal.cc index ef760c744..dcda8f7a2 100644 --- a/gpsbabel/gopal.cc +++ b/gpsbabel/gopal.cc @@ -49,6 +49,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include "strptime.h" #include "jeeps/gpsmath.h" diff --git a/gpsbabel/gpsutil.cc b/gpsbabel/gpsutil.cc index c7768e9d8..8dadf170e 100644 --- a/gpsbabel/gpsutil.cc +++ b/gpsbabel/gpsutil.cc @@ -21,6 +21,7 @@ #include "defs.h" +#include "cet_util.h" #include "magellan.h" #include #include diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc index 3035ff582..1ad76f2e0 100644 --- a/gpsbabel/igc.cc +++ b/gpsbabel/igc.cc @@ -24,6 +24,7 @@ */ #include "defs.h" +#include "cet_util.h" #include #include #include diff --git a/gpsbabel/netstumbler.cc b/gpsbabel/netstumbler.cc index 02771f172..b60b8f4b7 100644 --- a/gpsbabel/netstumbler.cc +++ b/gpsbabel/netstumbler.cc @@ -21,6 +21,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include #include diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc index 905b17ff7..09ef42f85 100644 --- a/gpsbabel/nmea.cc +++ b/gpsbabel/nmea.cc @@ -22,6 +22,7 @@ #include "defs.h" +#include "cet_util.h" #include "gbser.h" #include "strptime.h" #include "jeeps/gpsmath.h" diff --git a/gpsbabel/nmn4.cc b/gpsbabel/nmn4.cc index caba92509..41f5b8294 100644 --- a/gpsbabel/nmn4.cc +++ b/gpsbabel/nmn4.cc @@ -27,6 +27,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include #include diff --git a/gpsbabel/ozi.cc b/gpsbabel/ozi.cc index dfcb3103e..2786a8117 100644 --- a/gpsbabel/ozi.cc +++ b/gpsbabel/ozi.cc @@ -23,6 +23,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include "jeeps/gpsmath.h" #include diff --git a/gpsbabel/pcx.cc b/gpsbabel/pcx.cc index 14ce3766f..c0049acf7 100644 --- a/gpsbabel/pcx.cc +++ b/gpsbabel/pcx.cc @@ -22,6 +22,7 @@ #include "defs.h" #include "garmin_tables.h" +#include "cet_util.h" #include "csv_util.h" #include #include diff --git a/gpsbabel/raymarine.cc b/gpsbabel/raymarine.cc index eee63d622..59fada1be 100644 --- a/gpsbabel/raymarine.cc +++ b/gpsbabel/raymarine.cc @@ -44,8 +44,9 @@ */ #include "defs.h" -#include "inifile.h" +#include "cet_util.h" #include "csv_util.h" +#include "inifile.h" #include #include diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc index f5f01f03b..29d173ffb 100644 --- a/gpsbabel/stmsdf.cc +++ b/gpsbabel/stmsdf.cc @@ -31,6 +31,7 @@ #if CSVFMTS_ENABLED +#include "cet_util.h" #include "csv_util.h" #include "strptime.h" #include "jeeps/gpsmath.h" diff --git a/gpsbabel/stmwpp.cc b/gpsbabel/stmwpp.cc index 4b77abc07..3097bd72f 100644 --- a/gpsbabel/stmwpp.cc +++ b/gpsbabel/stmwpp.cc @@ -26,6 +26,7 @@ #if CSVFMTS_ENABLED #include "csv_util.h" +#include "cet_util.h" #include #include #include diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc index 2921d4254..32e187366 100644 --- a/gpsbabel/tiger.cc +++ b/gpsbabel/tiger.cc @@ -20,6 +20,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include #include diff --git a/gpsbabel/tmpro.cc b/gpsbabel/tmpro.cc index b60d16308..26c5fb781 100644 --- a/gpsbabel/tmpro.cc +++ b/gpsbabel/tmpro.cc @@ -33,6 +33,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc index aa8c030f3..0ba5c85f3 100644 --- a/gpsbabel/unicsv.cc +++ b/gpsbabel/unicsv.cc @@ -21,6 +21,7 @@ #include "defs.h" #include "cet.h" +#include "cet_util.h" #include "csv_util.h" #include "garmin_fs.h" #include "garmin_tables.h" diff --git a/gpsbabel/xcsv.cc b/gpsbabel/xcsv.cc index 365df6584..8b2e65581 100644 --- a/gpsbabel/xcsv.cc +++ b/gpsbabel/xcsv.cc @@ -24,6 +24,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include "jeeps/gpsmath.h" #include diff --git a/gpsbabel/xmltag.cc b/gpsbabel/xmltag.cc index 22578f526..ef71928e7 100644 --- a/gpsbabel/xmltag.cc +++ b/gpsbabel/xmltag.cc @@ -20,6 +20,7 @@ */ #include "defs.h" +#include "cet_util.h" #include "src/core/xmltag.h" #include #include -- 2.30.2